From 6b0b8573971816a49a4e8ca25df86c9ff8930f54 Mon Sep 17 00:00:00 2001 From: Michael Tokarev Date: Tue, 26 Nov 2024 17:28:51 +0300 Subject: [PATCH] force tevent to be standalone Forwarded: not-needed Upstream ships contents of lib/tevent/ as a separate source of tevent. Since we build samba anyway, there's no need to have separate tevent source package, it's enough to build it during samba build. Always build tevent as stand-alone library (instead of being samba-private if in a subdir). When building as a sub-library within samba, where libreplace is a private library, libtevent.so will have rpath pointing to the private samba dir. Since tevent actually does not use anything from libreplace, just remove the dependency. Gbp-Pq: Name tevent-standalone.diff --- lib/tevent/wscript | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/tevent/wscript b/lib/tevent/wscript index ab7b2ae4..4677c489 100644 --- a/lib/tevent/wscript +++ b/lib/tevent/wscript @@ -41,7 +41,7 @@ def configure(conf): else: conf.define('USING_SYSTEM_CMOCKA', 1) - conf.env.standalone_tevent = conf.IN_LAUNCH_DIR() + conf.env.standalone_tevent = conf.IN_LAUNCH_DIR() or True if not conf.env.standalone_tevent: if conf.CHECK_BUNDLED_SYSTEM_PKG('tevent', minversion=VERSION, @@ -100,7 +100,7 @@ def build(bld): private_library = True if not bld.CONFIG_SET('USING_SYSTEM_TEVENT'): - tevent_deps = 'replace talloc' + tevent_deps = 'talloc' # 'replace talloc' if bld.CONFIG_SET('HAVE_PTHREAD'): tevent_deps += ' pthread' -- 2.30.2